From: Keir Fraser Date: Mon, 31 Aug 2009 17:17:26 +0000 (+0100) Subject: xend: Fix c/s 20137 -- do not redefine built-in name 'str'. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13400 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=18e77400685b90f17f96480fc71540aa2cdfa2a3;p=xen.git xend: Fix c/s 20137 -- do not redefine built-in name 'str'. Signed-off-by: Keir Fraser --- diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index f5c9bdac94..32496041d1 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -2411,10 +2411,10 @@ class XendDomainInfo: log.exception(e) if not self.domid or self.domid < 0: - str = 'Creating domain failed: name=%s' % self.info['name_label'] + failmsg = 'Creating domain failed: name=%s' % self.info['name_label'] if self.domid: - str += ', error=%i' % int(self.domid) - raise VmError(str) + failmsg += ', error=%i' % int(self.domid) + raise VmError(failmsg) self.dompath = GetDomainPath(self.domid)